Use g_fopen().

2004-12-05  Tor Lillqvist  <tml@iki.fi>

	* demos/gtk-demo/main.c (load_file): Use g_fopen().

	* demos/gtk-demo/images.c (progressive_timeout): Use
	g_fopen(). Open png file in binary mode.

diff --git a/ChangeLog b/ChangeLog
index ba156a7dedf4597538cd55e85c917aa17400b43e..e6e8a9e9a2d014e9ee4f90f4d2cacc67230d0829 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-05  Tor Lillqvist  <tml@iki.fi>
+
+       * demos/gtk-demo/main.c (load_file): Use g_fopen().
+
+       * demos/gtk-demo/images.c (progressive_timeout): Use
+       g_fopen(). Open png file in binary mode.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
        
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ba156a7dedf4597538cd55e85c917aa17400b43e..e6e8a9e9a2d014e9ee4f90f4d2cacc67230d0829 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-12-05  Tor Lillqvist  <tml@iki.fi>
+
+       * demos/gtk-demo/main.c (load_file): Use g_fopen().
+
+       * demos/gtk-demo/images.c (progressive_timeout): Use
+       g_fopen(). Open png file in binary mode.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
        
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ba156a7dedf4597538cd55e85c917aa17400b43e..e6e8a9e9a2d014e9ee4f90f4d2cacc67230d0829 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-12-05  Tor Lillqvist  <tml@iki.fi>
+
+       * demos/gtk-demo/main.c (load_file): Use g_fopen().
+
+       * demos/gtk-demo/images.c (progressive_timeout): Use
+       g_fopen(). Open png file in binary mode.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
        
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ba156a7dedf4597538cd55e85c917aa17400b43e..e6e8a9e9a2d014e9ee4f90f4d2cacc67230d0829 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-12-05  Tor Lillqvist  <tml@iki.fi>
+
+       * demos/gtk-demo/main.c (load_file): Use g_fopen().
+
+       * demos/gtk-demo/images.c (progressive_timeout): Use
+       g_fopen(). Open png file in binary mode.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
        
        * configure.in: Bump version

diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index d9262c54e52b7e74f0a497576f245d57768bea25..4bb3fb81bdf74445bb2f77d1179beb8491431b2c 100644 (file)
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -13,6 +13,7 @@
  */
 
 #include <gtk/gtk.h>
+#include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
 #include "demo-common.h"
@@ -195,7 +196,7 @@ progressive_timeout (gpointer data)
        }
       else
        {
-         image_stream = fopen (filename, "r");
+         image_stream = g_fopen (filename, "rb");
          g_free (filename);
 
          if (!image_stream)

diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 3382f72f9639394e2e070c7c26ba68174369e149..c434ae0b507fa273f0cf65553fed557f20205887 100644 (file)
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <demos.h>
 
@@ -465,7 +466,7 @@ load_file (const gchar *filename)
       return;
     }
 
-  file = fopen (full_filename, "r");
+  file = g_fopen (full_filename, "r");
 
   if (!file)
     g_warning ("Cannot open %s: %s\n", full_filename, g_strerror (errno));